debaa172bcda9e6bb0ff41779a6e50fae6a82cdd,CLI/src/main/java/org/cloudifysource/shell/commands/UninstallService.java,UninstallService,doExecute,#,79

Before Change


		Map<String, String> undeployServiceResponse = adminFacade.undeploy(getCurrentApplicationName(), serviceName, timeoutInMinutes);
		if (undeployServiceResponse.containsKey(CloudifyConstants.LIFECYCLE_EVENT_CONTAINER_ID)){
			String pollingID = undeployServiceResponse.get(CloudifyConstants.LIFECYCLE_EVENT_CONTAINER_ID);
			boolean waitForLifecycleEvents = this.adminFacade.waitForLifecycleEvents(pollingID, timeoutInMinutes);
			if (!waitForLifecycleEvents) {
				throw new TimeoutException(TIMEOUT_ERROR_MESSAGE);
			}
		} else {
			throw new CLIException("Failed to retrieve lifecycle logs from rest. " +

After Change


		Map<String, String> undeployServiceResponse = adminFacade.undeploy(getCurrentApplicationName(), serviceName, timeoutInMinutes);
		if (undeployServiceResponse.containsKey(CloudifyConstants.LIFECYCLE_EVENT_CONTAINER_ID)){
			String pollingID = undeployServiceResponse.get(CloudifyConstants.LIFECYCLE_EVENT_CONTAINER_ID);
			this.adminFacade.waitForLifecycleEvents(pollingID, timeoutInMinutes, TIMEOUT_ERROR_MESSAGE);
		} else {
			throw new CLIException("Failed to retrieve lifecycle logs from rest. " +
					"Check logs for more details.");